Fix problem with string-valued parameters (#70012, Johan Dahlin.)

Fri Feb  8 20:24:58 2002  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkbindings.c (binding_compose_params): Fix problem
	with string-valued parameters (#70012, Johan Dahlin.)

	* gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix
	white space deletion.

diff --git a/ChangeLog b/ChangeLog
index 9fc3db38e7b79ca599b0f2f0f46c81bcca6a29ec..8ceaed0b54c48b9fe2b12da724e372ec14715357 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Feb  8 20:24:58 2002  Owen Taylor  <otaylor@redhat.com>
+
+       
+       * gtk/gtkbindings.c (binding_compose_params): Fix problem
+       with string-valued parameters (#70012, Johan Dahlin.)
+
+       * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix 
+       white space deletion.
+
 Fri Feb  8 21:25:56 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9fc3db38e7b79ca599b0f2f0f46c81bcca6a29ec..8ceaed0b54c48b9fe2b12da724e372ec14715357 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Fri Feb  8 20:24:58 2002  Owen Taylor  <otaylor@redhat.com>
+
+       
+       * gtk/gtkbindings.c (binding_compose_params): Fix problem
+       with string-valued parameters (#70012, Johan Dahlin.)
+
+       * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix 
+       white space deletion.
+
 Fri Feb  8 21:25:56 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9fc3db38e7b79ca599b0f2f0f46c81bcca6a29ec..8ceaed0b54c48b9fe2b12da724e372ec14715357 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Fri Feb  8 20:24:58 2002  Owen Taylor  <otaylor@redhat.com>
+
+       
+       * gtk/gtkbindings.c (binding_compose_params): Fix problem
+       with string-valued parameters (#70012, Johan Dahlin.)
+
+       * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix 
+       white space deletion.
+
 Fri Feb  8 21:25:56 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9fc3db38e7b79ca599b0f2f0f46c81bcca6a29ec..8ceaed0b54c48b9fe2b12da724e372ec14715357 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Fri Feb  8 20:24:58 2002  Owen Taylor  <otaylor@redhat.com>
+
+       
+       * gtk/gtkbindings.c (binding_compose_params): Fix problem
+       with string-valued parameters (#70012, Johan Dahlin.)
+
+       * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix 
+       white space deletion.
+
 Fri Feb  8 21:25:56 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9fc3db38e7b79ca599b0f2f0f46c81bcca6a29ec..8ceaed0b54c48b9fe2b12da724e372ec14715357 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Fri Feb  8 20:24:58 2002  Owen Taylor  <otaylor@redhat.com>
+
+       
+       * gtk/gtkbindings.c (binding_compose_params): Fix problem
+       with string-valued parameters (#70012, Johan Dahlin.)
+
+       * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix 
+       white space deletion.
+
 Fri Feb  8 21:25:56 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9fc3db38e7b79ca599b0f2f0f46c81bcca6a29ec..8ceaed0b54c48b9fe2b12da724e372ec14715357 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Fri Feb  8 20:24:58 2002  Owen Taylor  <otaylor@redhat.com>
+
+       
+       * gtk/gtkbindings.c (binding_compose_params): Fix problem
+       with string-valued parameters (#70012, Johan Dahlin.)
+
+       * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix 
+       white space deletion.
+
 Fri Feb  8 21:25:56 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9fc3db38e7b79ca599b0f2f0f46c81bcca6a29ec..8ceaed0b54c48b9fe2b12da724e372ec14715357 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Fri Feb  8 20:24:58 2002  Owen Taylor  <otaylor@redhat.com>
+
+       
+       * gtk/gtkbindings.c (binding_compose_params): Fix problem
+       with string-valued parameters (#70012, Johan Dahlin.)
+
+       * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix 
+       white space deletion.
+
 Fri Feb  8 21:25:56 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 50e0a421fee50a1406bf6ba2cbea705df5e291e4..8299e45a160f1e86d23fa06413fbfdda7807267d 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -580,10 +580,14 @@ libgtk_target_ldflags = $(gtk_win32_symbols) -lwsock32
 endif
 EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la libgtk-win32-1.3.la
 
-# Install a RC file for the default GTK+ theme
+# Install a RC file for the default GTK+ theme, and key themes
 install-data-local:  install-ms-lib install-libtool-import-lib
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
        $(INSTALL) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
+       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key
+       $(INSTALL) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
+       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key
+       $(INSTALL) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
        rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
@@ -627,6 +631,8 @@ EXTRA_DIST += @STRIP_BEGIN@         \
        gtk-win32.rc            \
        gtk-win32.rc.in         \
        gtkrc.default           \
+       gtkrc.key.default       \
+       gtkrc.key.emacs         \
        makefile.mingw          \
        makefile.mingw.in       \
        makefile.msc            \

diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index 626bdd6eb41e60d23e2dd6da6833cb8e2240e5b5..676ff3ed8df904c162f7f6e02ce99e3837f2f101 100644 (file)
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -350,7 +350,7 @@ binding_compose_params (GtkObject       *object,
          else
            {
              g_value_init (&tmp_value, G_TYPE_STRING);
-             g_value_set_static_string (params, args->d.string_data);
+             g_value_set_static_string (&tmp_value, args->d.string_data);
            }
          break;
        default:

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 23729f00038af7a6abbede07527a83be55d88164..c8363717763ce05a54ff47708c4a2dcb2a6b52d8 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3091,7 +3091,7 @@ gtk_entry_delete_whitespace (GtkEntry *entry)
   while (start > 0 && log_attrs[start-1].is_white)
     start--;
 
-  while (end < n_attrs && log_attrs[start-1].is_white)
+  while (end < n_attrs && log_attrs[end].is_white)
     end++;
 
   g_free (log_attrs);